From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 20 Nov 2011 20:17:13 +0000 (-0500)
Subject: * src/window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1591
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4427acf6d41cecbbeed47b23e5f4933f6e68d472;p=emacs.git

* src/window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 11d897c66b2..f782d1192f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
 	* nsfont.m (syms_of_nsfont) <ns-reg-to-script>: Fix typo.
diff --git a/src/window.c b/src/window.c
index 4a5dcd85631..21c0cea5d14 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5783,7 +5783,7 @@ get_phys_cursor_glyph (struct window *w)
   if (!row->enabled_p)
     return NULL;
 
-  if (w->hscroll)
+  if (XINT (w->hscroll))
     {
       /* When the window is hscrolled, cursor hpos can legitimately be
 	 out of bounds, but we draw the cursor at the corresponding